Allow NMI watchdog setup on newer P4 processors.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c
index e2a053fe9359359417ee123640ad21f7fe15dbab..0ba9a9e8268f167a2d46e65e04b6dddac7e5a002 100644 (file)
--- a/xen/arch/x86/nmi.c
+++ b/xen/arch/x86/nmi.c
@@ -322,15 +322,9 @@ void __pminit setup_apic_nmi_watchdog(void)
     case X86_VENDOR_INTEL:
         switch (boot_cpu_data.x86) {
         case 6:
-            if (boot_cpu_data.x86_model > 0xd)
-                return;
-
             setup_p6_watchdog();
             break;
         case 15:
-            if (boot_cpu_data.x86_model > 0x4)
-                return;
-
             if (!setup_p4_watchdog())
                 return;
             break;